Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Thu, 10 Mar 2016 15:55:06 +0000 (10:55 -0500)
committerTom Rini <[email protected]>
Thu, 10 Mar 2016 15:55:06 +0000 (10:55 -0500)

Trivial merge